From ff65e77c577370862a0e6bc7de3c968308c92aa5 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Thu, 25 Dec 2014 08:49:47 +0100 Subject: Added basic style checking to Travis builds. --- CIbuild.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/CIbuild.sh b/CIbuild.sh index 5d95f88a6..6e54187ac 100755 --- a/CIbuild.sh +++ b/CIbuild.sh @@ -7,6 +7,7 @@ export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER export MCSERVER_BUILD_DATETIME=`date` cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1; +lua src/CheckBasicStyle.lua make -j 2; make -j 2 test; cd MCServer/; -- cgit v1.2.3 From e8c8aca7791a598244aa9dcc9a0992d2c249652d Mon Sep 17 00:00:00 2001 From: Mattes D Date: Thu, 25 Dec 2014 08:59:28 +0100 Subject: Travis: Added lua installation before build. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 26e74c1b2..84b963a89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,9 @@ before_install: install: # g++4.8 and clang - sudo apt-get install -qq g++-4.8 + + # lua, needed for style checking and possibly later on for bindings generation + - sudo apt-get install -qq lua5.1 # g++4.8 - if [ "$CXX" == "g++" ]; then export CXX="g++-4.8"; export CC="gcc-4.8"; fi -- cgit v1.2.3 From f5005fd2f8abf39387ec86e39db9d3421a03ad37 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Thu, 25 Dec 2014 09:11:25 +0100 Subject: Travis style check in the right folder. --- CIbuild.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CIbuild.sh b/CIbuild.sh index 6e54187ac..755dc7daa 100755 --- a/CIbuild.sh +++ b/CIbuild.sh @@ -7,7 +7,9 @@ export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER export MCSERVER_BUILD_DATETIME=`date` cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1; -lua src/CheckBasicStyle.lua +cd src +lua CheckBasicStyle.lua +cd .. make -j 2; make -j 2 test; cd MCServer/; -- cgit v1.2.3